From b3f76223d2942c9bb32eedf064440dba39c937c1 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 14 Sep 2018 10:05:10 +0100 Subject: [PATCH] Drop support for OLD_MODULES_BASE_PATH GTK+ 4 only supports modules in the multiarch location. --- debian/changelog | 2 ++ debian/libgtk-4-0.postinst.in | 3 +-- debian/libgtk-4-0.triggers.in | 1 - debian/rules | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index b2858b1668..09052ee4c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,8 @@ gtk+4.0 (3.94.0-1) UNRELEASED; urgency=medium - Mark them as flaky for now * Disable GStreamer video support for now * Stop installing gtk4-query-immodules, superseded by gio-querymodules + * Drop support for OLD_MODULES_BASE_PATH. GTK+ 4 only supports modules + in the multiarch location. -- Jeremy Bicha Fri, 19 Jan 2018 22:05:35 -0500 diff --git a/debian/libgtk-4-0.postinst.in b/debian/libgtk-4-0.postinst.in index d2ca813e82..fd8b942577 100644 --- a/debian/libgtk-4-0.postinst.in +++ b/debian/libgtk-4-0.postinst.in @@ -2,7 +2,6 @@ set -e IMMODULES_DIR=/@MODULES_BASE_PATH@/immodules -IMMODULES_DIR_OLD=/@OLD_MODULES_BASE_PATH@/immodules if [ "$1" = triggered ]; then # This is triggered everytime an application installs a @@ -14,7 +13,7 @@ fi #DEBHELPER# # Also handle the initial installation -if [ -d $IMMODULES_DIR ] || [ -d $IMMODULES_DIR_OLD ]; then +if [ -d $IMMODULES_DIR ]; then /@LIBDIR@/@SHARED_PKG@/gtk4-query-immodules --update-cache || true fi diff --git a/debian/libgtk-4-0.triggers.in b/debian/libgtk-4-0.triggers.in index 85a23ca097..d40b55b059 100644 --- a/debian/libgtk-4-0.triggers.in +++ b/debian/libgtk-4-0.triggers.in @@ -1,2 +1 @@ interest-noawait /@MODULES_BASE_PATH@/immodules -interest-noawait /@OLD_MODULES_BASE_PATH@/immodules diff --git a/debian/rules b/debian/rules index 2f0bef0225..51fc653ff3 100755 --- a/debian/rules +++ b/debian/rules @@ -31,7 +31,6 @@ CONFDIR := etc/gtk-4.0 # relative base directory for all types of modules MODULES_BASE_PATH := $(LIBDIR)/gtk-4.0/$(GTK_BINARY_VERSION) -OLD_MODULES_BASE_PATH := usr/lib/gtk-4.0/$(GTK_BINARY_VERSION) # package names SHARED_PKG := libgtk-$(APIVER)-$(SONAME) @@ -84,7 +83,6 @@ debian/%: debian/%.in -e "s#@LIBDIR@#$(LIBDIR)#g" \ -e 's#@CONFDIR@#$(CONFDIR)#g' \ -e "s#@MODULES_BASE_PATH@#$(MODULES_BASE_PATH)#g" \ - -e "s#@OLD_MODULES_BASE_PATH@#$(OLD_MODULES_BASE_PATH)#g" \ -e "s#@NEWS@#$(NEWS)#g" \ -e "s#@README.md@#$(README.md)#g" \ $@.in > $@ -- 2.30.2